Resolve conflict over use of name xen_elfnote.
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Mon, 26 Feb 2007 11:21:03 +0000 (11:21 +0000)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Mon, 26 Feb 2007 11:21:03 +0000 (11:21 +0000)
commitf7e153faad1237a5e08ae2aa58d704d990843861
tree5cd7bdeaa1b34989ac55decdbb03c772c428def2
parentcf5a7b113fb1a10be495a090fef46e1eb8c71ed0
Resolve conflict over use of name xen_elfnote.
Signed-off-by: Keir Fraser <keir@xensource.com>
tools/libxc/xc_core.c
tools/libxc/xc_core.h
tools/libxc/xc_ptrace_core.c
xen/arch/x86/domain_build.c
xen/include/public/libelf.h